From febde6d3526433e019a8bee635cff9dabeaf053b Mon Sep 17 00:00:00 2001 From: "rn@wyvis.camb.intel-research.net" Date: Tue, 11 Feb 2003 17:54:17 +0000 Subject: [PATCH] bitkeeper revision 1.26 (3e4938c9hNFygt8GXCkq3B5mRmOxrQ) minor fixed due to messed up merge --- xen-2.4.16/common/domain.c | 3 --- xen-2.4.16/include/xeno/ac_timer.h | 2 +- xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/xen-2.4.16/common/domain.c b/xen-2.4.16/common/domain.c index 046b2f5878..06304e3718 100644 --- a/xen-2.4.16/common/domain.c +++ b/xen-2.4.16/common/domain.c @@ -224,7 +224,6 @@ int final_setup_guestos(struct task_struct * p, dom_meminfo_t * meminfo) l1_pgentry_t * l1tab; start_info_t * virt_startinfo_addr; unsigned long virt_stack_addr; - unsigned long long time; unsigned long phys_l2tab; net_ring_t *net_ring; net_vif_t *net_vif; @@ -357,9 +356,7 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params) unsigned long phys_l1tab, phys_l2tab; unsigned long cur_address, alloc_address; unsigned long virt_load_address, virt_stack_address, virt_shinfo_address; - unsigned long virt_ftable_start, virt_ftable_end, ft_mapping; start_info_t *virt_startinfo_address; - unsigned long long time; unsigned long count; unsigned long alloc_index; l2_pgentry_t *l2tab, *l2start; diff --git a/xen-2.4.16/include/xeno/ac_timer.h b/xen-2.4.16/include/xeno/ac_timer.h index f78082cb6b..7cf568d2fc 100644 --- a/xen-2.4.16/include/xeno/ac_timer.h +++ b/xen-2.4.16/include/xeno/ac_timer.h @@ -20,7 +20,7 @@ #ifndef _AC_TIMER_H_ #define _AC_TIMER_H_ -#include /* include notion of time */ +#include /* include notion of time */ /* * The Xen Hypervisor provides two types of timers: diff --git a/xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c b/xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c index 9f53010b73..7ba39d22ca 100644 --- a/xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c +++ b/xenolinux-2.4.16-sparse/arch/xeno/kernel/time.c @@ -337,7 +337,6 @@ void __init time_init(void) do_gettimeofday(&xtime); last_irq = (((long long)xtime.tv_sec) * 1000000) + xtime.tv_usec; - printk("last: %lld\n", last_irq); setup_irq(TIMER_IRQ, &irq_timer); -- 2.30.2